[MOD] Use type parameter in `Option`.
Merge pull request #983 from LeoWoerteler/option-unused-stable

[MOD] Use type parameter in `Option`.