mher: Cleanup part 2.