Simplify matcher code even further.