More realignment of variable names with their content, in pass 5.