More progress on allowing handle to use eval'