Fix remaining old style classes
Merge pull request #18 from google/fix_oldstyle_classes

Fix remaining old style classes