Fix list of ops for preprocesser MacroDefinition handler; also fix cache_wrapped names in FunctionDecl handler