Library refactor. Macro specs are now tagged as :macro.