Better injection of variables into eval'd code