rename none_t -> none_type, move to private member of optional