Multiple syntax fixes and additions for the TP visitor
Merge remote-tracking branch 'origin/sdf' into newpog
Simplified OpDefContexts since state variables are not necessary.