More MacroFunctionReader cleanup, especially Features reader and Unicode character reader.