Tweak extraction and localization and filtering.

I should really break this into some smaller commits.