Add AST to trace instructions. Sync some with master.