Locator synchronization code cleanup.