This will make --list-options (and some other code paths) actually return the proper default. Shouldn't change behavior.