t7006: modernize calls to unset