This simple 2-patch series is a bit of cleanup that i noticed while
completing the work on handling S/MIME messages.
It's not strictly part of the S/MIME series, so breaking out this
minor cleanup separately should make it easier to review.
Regards,
--dkg