Some additional Host related refactoring.