Remove the const int, and fix another warning.