Work on bug #8081.  All of the outputs are done now.