Do less unnecessary work!

Squished!
Merge pull request #83 from jory/fix-fewer-operations

Do less unnecessary work!