Little refactoring in msk-utilities.