Strengthen `lookup_merge` and remove `DiagNone`

We could strengthen lookup_merge as follows:

merge f m1 m2 !! i = match m1 !! i, m2 !! i with None, None => None | mx, my => f mx my end

See also the discussion here: !217 (comment 61801)