OFXMLFactory: Fix FIXMEs, TODOs and possible off-by-one.