Minor Utils refactoring.