Fix bug introduced by r28236: make declaration and instantiation agree
on "const".