Fixup use of const.