Bunch of parsing changes.