Cleanup: Make locator type less explicit