Small refactoring.
Merge remote-tracking branch 'origin/lasse' into roope