An alternative refactoring for Location.