Add EVAL-WHEN over utility functions