Ensure that Option.Some can never be null
Merge branch 'option-some-not-nullable'