SS-597 remove final traces of ::Mash from right_support