Minor checkNotNull cleanup