A bit of annoying work needed to be done to get some
syntaxy things working. This is up there for title of
worst commit message.