Remove some more usage of NonNull