Fixing up expression evaluation.
Merge branch 'master' of github.com:rjpower/sparrow