Fixed *Eval issues discovered by David Linse, who also contributed the test.