Start using the SWITCH_COMPARTMENT macro.