fixup! Factor out ServiceCombiner from MetaInfCombiner
fixup! Refactor CombineAnnotations to AnnotationCombiner