Refactoring: add new Location ctor.
Revert file.