Getting schooled by rubocop. Remaining failures in code I didn't touch.