matcher: code review fixes