Okay, so it wasn't complete.  Fix some new parser bugs.