More text refactoring.