Constness fixes, mostly.