artf230740: archetype improvements and cleanup.