Make deferring of edit_file work properly