Merge "Canonicalize filepaths before saving to db."