Refactor: use Option.map₂ (#1439) This is a forward-port of leanprover-community/mathlib#18081
Option.map₂