Continued logging refactoring.