Reduce number of Text to String and String to Text conversions.

Basically try to avoid String whereever possible.
Merge pull request #212 from erikd/master

Reduce number of Text to String and String to Text conversions.