Cleaned up the way the new table system works.