Squash uppercase_variables warnings