embedding: change Option<> unwrapping for fptrs to use match