Even more refactoring of Table implementation.