The wrong expression class got in again. I don't know how that happened.
Added breaks to the grammar.

Resulted in no additional choice conflicts, so it's perfectly harmless.
Merge branch 'master' of https://github.com/ty707/SCALR