Added an OPTIMIZE comment about using TagBimap instead of two separate Map fields.