kcminit: Some code refactoring

ivan tkachenkorequested to merge
work/ratijas/kcminit-refactor into master

The last of those commits feels more like a refactoring for refactoring's sake. Others range from actually useful to "at least not evil".

Merge request reports