Again I worry how many (subtle) bugs we'll have because of not spotting when something is null that shouldn't be. But not a strong enough feeling to change what you've done here.