Gittrac #1782:  got rid of most of the debug code.