kill remaining calls to extract()

Change-Id: I67bd5c2d1f6662a6035266320b9d6bc833192177
Follow-up Ib0d0f6c: Fix qqq typos

Change-Id: Ia5f514761adc8d6cbda839ac7b04ad3edb8d5faf