Expressions' state variables refined.
Merge branch 'master' of https://github.com/haslab/echo