Improved option handling for mailing and batch.