Got the table rewrite (pass 1) completed.  More refactoring still needed.