Fix some foodcritic complaints
This tag has no release notes.