More work on bug #7950.  Now all of the input tables are being represented.