Define internal representation for programs
Merge remote-tracking branch 'downstream/master'