Fix unwind passing of AJOIN
Add comments to point to where unwinds are handled