Update AOM, ADL for new rule for use_archetype statements - now have to have id-codes in all cases.