@sdeleuze I have created an issue to track the problem -
https://youtrack.jetbrains.com/issue/KT-30986
But I’m not sure we’ll be able to offer any good solution in a short term (say in 1.3.31). See the thread above for my arguments and questions, as well as a solution for your particular case.