One last pass of DataLayout variable renaming.