Tidy up some string expansions