Ben suggested a long time ago I look at using bison for the parsing of the source files, so I’ve started trying to figure out how to do that with bison. Hopefully it’ll allow me to remove all that ugly parser code that doesn’t quite work in all situations…