Merge "Refactor now that these path constructions are always the same."