Use an explicit ON clause rather than USING, for the CAA move trigger.
Merge branch 'caa-move' into beta

* caa-move:
  Use an explicit ON clause rather than USING, for the CAA move trigger.
Use an explicit ON clause rather than USING, for the CAA move trigger. (again, this time for the right trigger)