Cleaned up another set of conditionals in the SMTP server.