Cleanup: match pair now also used extension.Declaration