Contributing to DataTypeAnalyzer is only possible using service ids

Currently the only way to contribute to DataTypeAnalyzer service is using service id:

public static void contributeDefaultDataTypeAnalyzer(
MappedConfiguration<Class, String> configuration)

It should be possible to use @Contribute annotation accompanied by a marker annotation to provide contributions for the DefaultDataTypeAnalyzer service.