A few more code cleanups
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=75058359