Use newer style finders.