I hope that KT-42561 and KTIJ-410 also get fixed before the changes that cause these issues end up in the non-EAP Kotlin plugin.