Improve handling of desugared matches

Close #138.

There are still some glitches where usual match clauses are recognized
as desugared ones.