Cosmetic changes

Differential Revision: http://llvm-reviews.chandlerc.com/D1577