Trying to get the parser not to hang.

Still a work in progress.