Improved flexibility in calculator grammar.