Merge "Some clean up."
Xavier Ducrohet [Sat, 15 Sep 2012 01:00:50 +0000 (18:00 -0700)]

Trivial merge