Moving up `curl` and `curl-dir` distinctions