I've spun off the issue of this repeated boilerplate as #3188.