follow up to r111264; split up class into one representing a table and one representi...