Merge pull request #1947 from afs/yasr-alt

GH-1946: Switch to use zazuko yasr/yasqe