Further refactoring of text-controller-impl

No match.