Reorder code a bit such that new/old parser has same method order.

Easier to diff/compare.