Improve auto-wind-down behavior.