Revert "simplification in substitution and function evaluation"
Merge pull request #1208 from kframework/revert-1205-master

Revert "simplification in substitution and function evaluation"