Fixes such that all languages parse

Not sure how correct these changes are…!

I was just hacking in order to add support for extra languages.