Fixing more -Wcast-qual warnings; NFC.