Warning cleanup

[parnic]

I still need to get the "any"s changed into proper types, but I wanted to make sure the rule changes were compatible before going too much farther.