Fix bugs in right-recursive part of spec. Those productions are seriously weird