Fix hierarchy so pull_and_handle goes through rescuer