Factor out some magic numbers.
Restore evaluation.
Fix failing tests.
Merge branch 'master' of https://github.com/frenetic-lang/frenetic