Also, add `current-directory-for-user' and `srcloc->string', and adjust the way that source-location paths are reported to be relative to `current-directory-for-user'.