Fix now-invalid scanner calls