Remove extraneous joins

I don't know why I was doing that, but it was dumb. Now I'm using a much
cleaner method to make some of the short strings. Also added some TODOs.