Misc LALR enhancements

Builds on cleanup work in PR #7, so will require that if you want to merge it.