Move const into more logical position.