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

[MOD] Use type parameter in `Option`.