Generally looks good. I assume there are no unit tests for current_path where we could regression test the new behavior? http://llvm-reviews.chandlerc.com/D1335