Merge change 6322

* changes:
  Start teaching the code generator about types.