ACT and ACST were already present.  AMT and AMST conflict with the
existing entries for Armenia; no change there for the moment.