Enhance active state toggling.