mher: Minor refactoring.