Really fix those nasty strings

Fix them early, fix them good.