Redid the processing to make the "-a" switch cleaner.