small evaluator refactoring
Merge pull request #2586 from jquadrin/patch-1

small IEx evaluator refactoring