The only comment I have it that any saved font family settings in the registry will be lost after committing the patch. IMO, for reading, we should try to load (new) FontFamily and if not present, try to load (old) FontPitchFamily. And for saving, always use FontFamily. That way, registry will be transparently updated to new key.