Add handling of nonexistent argument file. Minor refactoring.