[MOD] Use type parameter in `Option`.

For the `stable` branch.