Clean up the extract() calls, and see if that makes hhvm happy