Various small parser cleanups.
Various small parser cleanups.

altmetric/oga,YorickPeterse/oga,dfockler/oga,jeffreybaird/oga,altmetric/oga,altmetric/oga,YorickPeterse/oga,altmetric/oga,ttasanen/oga,altmetric/oga,ttasanen/oga,YorickPeterse/oga,jeffreybaird/oga,jeffreybaird/oga,dfockler/oga,ttasanen/oga,dfockler/oga,YorickPeterse/oga,jeffreybaird/oga,dfockler/oga,YorickPeterse/oga,ttasanen/oga,ttasanen/oga,dfockler/oga,jeffreybaird/oga