Fix doc contracts
Add #:when to more places in match docs

Also adjusted some examples a bit