More work on bug #8313.  More of the pieces are in place.