s4:dsdb/descriptor: remove some nesting from descriptor_modify