Tweaks for parser.  Resolves some nesting issues.