Merge "Move details of variable printing out of the generated code."