Fixes a few minor bugs as well with flags which take arguments but for which the values can never be known.