Fix two argument "put"
scope of substitutor
Merge branch 'anaphora'