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

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