Clean up for bug #7959.  There were lots of little things that I missed before.