ServiceLoader.load(Class) changes and Java <> syntax