Make a few more DataLayout variables const.