Fix KWStyle warnings.

Also reverting a hunk from 355fca64.
Merge topic 'framework-refactor' into next

94ee14e Fix KWStyle warnings.