Handling more constant expressions.
Merge branch 'develop' into svcomp2015