Adjust Some(nil) to return None() so that "surprising" nils don't emerge.