Clean up simple text cases in prep for code generator