Extract and pull-up some common method implementations and make them default methods of the interface. See gh-22884