avoiding some Salt performance bottlenecks in SaltAnnotateExtractor