Misc. refinements to TagMappingTable and the related.