Revert "Simplify Option c'tor"