Refactorings of the latest code.