Forgot to commit some extractor changes.