Pre-release refactoring.