The structure is totally in place now for bug #7393.  I just need to add more checks.