Kill the use of `extract()` and fix some textdomains
Misc tidy up