Merge "Misc clean up."
Xavier Ducrohet [Fri, 1 Feb 2013 00:20:20 +0000 (00:20 +0000)]

Trivial merge