Cleaning up, suppressing warnings that we can't do anything about due to vanilla code.

Should be no behavioral change at all. Mostly suppressing warnings, adding generic type declarations, etc.