Committed const-correctness errors.  Code now compiles with -Werror and -Wall