Changed Option.Match signature