embedding: convert callback Option<> matching to map()