More kohelpers refactoring.
More refactoring of kohelpers.