Fix auto-case insertion (too eager) and parent-delete-prevention