refactor_options.py: fix some special cases