Changed method signatures to use "const" whenever possible.