Have extractor configuration checking match collator.

Clean up - no intended functionality change.