This fixes #7580.  There is now a table interface.