Further improvements for switchback usage.