Grammar, language refactoring