Fix a number of problems with argument handling.
2 files changed