Supports "%" in calcs.
Removed trailing ;