More refactoring of FormattedText.