Fix Locator ctor/dtor sequences.