am 121cda9e: am aec4e96e: Merge "Move details of variable printing out of the generated code."

* commit '121cda9e6fcd545c1c53daf5cf50e8dd10e1c009':
  Move details of variable printing out of the generated code.