Flag uses of extract()

extract() sucks.

Fixes #35