Hygiene: Get rid of extract()

extract() is opaque, it's hard to know exactly which variables it'll create/
overwrite. That, and it makes my analyser whine for undefined variables ;)

Change-Id: I20b442852afbe9cf6f1cb6e7506246aa1a5930e0