TextField cleanup.

#965