Continued daemon refactoring.