More const changes.
4 files changed