Fixes for more robust handling of command-line parse errors.