A couple const cleanups.