- Improved matcher behavior.