First parts of refactoring MacroFunctionReaders. Got rid of the FunctionReaderUtils class too.