unify handling of expressions
Merge pull request #1203 from dereuromark/master-cleanups

unify handling of expressions