Default to the correct file, based on desired type

I just realized that I introduced a bug in extract_options.