#3140: updated grammars again to use number instead of constant (fixing a bug I introduced earlier) and updated samples again.