Parser: `matches` -> `match`
Parser: remove unnecessary props