reduce a few common kinds of linter warnings

Created by: chrispine

Now that I can run the campaigns tests in reasonable amount of time, I thought I'd chip away at a bit of the linter noise.