Catch more helper code up with demise of text_for
Refactor/expose some turn text management code