Saner locking around deactivate_super()