Actually, I think I screwed up here. The following would correctly preserve the existing behavior.

```objective-c
return dictionary[key ?: NSNull.null] ?: defaultValue;
```