Streams: nits
Streams: support Option.orNull