Fixed option type. Now uses nothing of type Nothing, which seems more correct.