More work on bug #7950.  The outputs work right now.