Convert some manual concatenation to the new join_paths helper.
It was getting old... Remove the unused parts, refactor the few parts still in use.