More work on bug #8378.  Still working on the main report.