Fix several recent rubocop offenses