More archetype cleanup.