artf230740: fixes for archetype cleanup.