Let's make this locator better in the application code too.