Add eval-and-replace