Improve pass-finding around the s/c departure