Removed unsupported token. Added dice support! Also standardized calls, so factor and expression are analogous. Still don't like the case statement in factor, since it means no exception if the input is not valid