Slight refactorings
Merge branch 'NFC' of https://github.com/werkgroepandroid/ksm into NFC