Cosmetics (matcher_t -> struct matcher).