U2: Minor parser cleanup.
U2: Minor parser cleanup.

foam-framework/foam,foam-framework/foam,jlhughes/foam,mdittmer/foam,jacksonic/foam,mdittmer/foam,jlhughes/foam,mdittmer/foam,foam-framework/foam,foam-framework/foam,jlhughes/foam,jacksonic/foam,jacksonic/foam,jlhughes/foam,jacksonic/foam,foam-framework/foam,mdittmer/foam