Small cleanup, removing call_eval method.