Fix some loose ends in ARGV parsing and config file selection.