Add a disabled and unproven optimisation
Fix insert_new and delete_object dependencies