Balanced my current-directory var more.

The let expression was a bit too complex for my liking. It's a shame I
can't use the Clojure style let where you can rely on values that you
defined on the lines above, that would make this really elegant.