More changes. Next: removing all the showS stuff because afaik show is
unneccessary here, since everything is already Text.
This will probably be a large and painful change.