Oh, also, this could be `ty::trait_method_of_method(cx.tcx, def_id).unwrap_or(def_id)`.

(Copying my commit comment here so it's preserved post-rebase/update.)