Last const changes.

Few enough that I could test them locally.