Merge "Clean up: use constants where we should be using them."
Xavier Ducrohet [Fri, 15 Feb 2013 20:30:53 +0000 (20:30 +0000)]

Trivial merge