Make parsing consistent with the master code

This is a part of my effort to get the grizzly devstack similar to master.