Refactor without breaking behavior (Kotlin)

Characterization tests, small mechanical steps, and clean-cut commits keeping refactors boring.