Avoid mapping optionals as owned pointers