Fix deleting out of SupSub blocks

See commits, there's just 2 of them