Improved state handling for ToggleButtonModel