Fix the pre-mature exit bug; discover a new bug

The pre-mature exit from evaluation bug was fixed but now I found a class of
expressions where it is a problem to not exit early. It's in the TODO again.

Maybe it would be best to rewrite the thing more cleanly...