ff612f15cf
This is to address the not-yet-resolved comments in https://github.com/JetBrains/kotlin/pull/5127, plus a few other small (non-functional) changes. ^KT-58986: In progress