More work on bug #8339.  The site now loads without errors.  I am just cleaning some stuff up.