Rebuild defense sets using a custom hybrid mode mechanism.

Fix augmented ring vars.