Fix the generics for Optional.