Commit c125875f introduced a change that with some compilers generates a warning about the "const" variable definition being ignored on an assignment.
