Make a few more things const.