- replaced 's in productions everywhere with "s (we were inconsistent in

  some places)
- removed extra []'s around switch decl/tag expression - not needed

SVN=112117