A couple more minor cleanups.
A couple more minor cleanups.

EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing