Several classes and functions were not const-correct. Did the minimal changes
to fix compilation, although there are other const fixes that can be done.