Expanded paths are kept between page loads; small internal refactor