Rename a few more DataLayout variables.