A bit more code clean up before starting another refactoring.