[sledge] Strengthen canonization of Extract terms
[sledge] Strengthen canonization of Extract terms

Differential Revision: D31926245

fbshipit-source-id: b4e4549ac

facebook/infer,facebook/infer,jvillard/infer,facebook/infer,jvillard/infer,jvillard/infer,facebook/infer,jvillard/infer,jvillard/infer,facebook/infer,jvillard/infer,facebook/infer,jvillard/infer,facebook/infer