Rearrange things to make rubocop and foodcritic happy.