Replaced HintsDescriptorLocator code to use my new Locator object.  This...

... meant changing HintsReader also.