(#3477) Implement corrections as agreed.  Also fixed double-delete bug.