Incorporate Dave's armory changes.