Small tidy of manual_delete stuff.