The move up the hierarchy reflects the fact that MetadataExtractor is more generally useful and not tied to annotations.