:optional-ize more dependencies

This requires departing from the real names of the mutt options.
I don't like this, but apparently the alternative is worse.