Refactor Extractor to have methods for field types in query clauses.

Look up synonyms where appropriate.

refs #134