More work on the option type

Adding support for ?string, ?date, ?time, ?datetime.