CL: Refactor and detect Simulator ranging failures.