Code cleanup: more annotations for PathMacroManager