Fiddled with the parser some more things broke.