* Revert revert r39662 of my parser changes.