Work on bug #7097.  Some changes to the table class.