Update cwcc to understand EXPR_MATCH