OK let's say I was tired... see details

* changing match x with to function x was delirium. Reverted
* composition abusing reverted. Sometimes, simple application is fine too.
* couples are done with the ',' character (syntax error)
* updated tests according to the renaming