Reconcile with assitant changes in Overture.

See overture commit #13fb48
Merge remote-tracking branch 'origin/ldc/astntrw' into newpog