Improve with-directory-from-bookmark