Avoid generating calc() expressions when just adding a 0 value.
Merge pull request #357 from dstockwell/simple-calc

Avoid generating calc() expressions when just adding a 0 value.