You are correct that 'mail.sendmail_template' et al. aren't command options.  I still don't like the tabular form (but it isn't introduced by your PR, either, so not your problem).