With the upgrade, we should be able to leverage https://youtrack.jetbrains.com/issue/KT-75169 to remove @Suppress("EXTENSION_SHADOWED_BY_MEMBER") annotations.