math: cosmetic cleanup (use explicit union instead of fshape and dshape)