Use new strategy for testing EVAL-WHEN.