Fix a very nasty conversion bug in Option c'tor