End of deep refactoring of NodeLocationImpl