Make output list of `mkoptions.py` more accurate (#6572)