Fix foodcritic failures.

FC021 is still failing, but I believe it's a false positive. Leaving
for now.