swift234

Move static members into the class because future features will need access to class members. No functionality change.

Swift SVN r11269