Using File.join more consistently.