Correct, I think we may need (at least in the longer term) to overhaul this parser pretty drastically. That said, this is probably good-enough for the moment.