Kotlin grammar generator improvements