Merge pull request #193 from oxcaml/make-short-paths-lazier

Merge pull request #193 from oxcaml/make-short-paths-lazier #850