Fix bug in Parser, MacroExpansions were not added to the declaration they "belong" to