Merge "Keep better tabs on secondary tables."