Improve r172577 by using the correct type when declaring constants