Re-use bit from superclass and extract stuff into a local
function.  Serves a patch we're kicking around out-of-tree.