Merge "parser: Remove aliases for __EXPECTUNUSEDCATEGORY__"