Simplified and clarified the custom evaluation code
For #8-eval-to-store