Misc LALR enhancements