Clean up dictionary usage in AbstractTable as per #232