nnir.el: Rearrange code to allow macros to be autoloaded by gnus-sum.el.