As part of this cleanup I think it may make sense to move the whole hunk where a kstat is uniquely added to a module in to it's own helper function just like you did with the other kstat_*_module helpers.