Improved clock discovery.