Changed keySet to stringKeySet for CH builds 2636 and higher

This is the only problem we've encountered thus far with the changes in that build.