Went back and re-did some special cases infolving pos and infix operators. More specifically got rid of optional semicolons. They were messing everything up. However, I got us back where we used to be, albeit with some more special case code.