Pass callers consistently in syntax-agnostic message matchers.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>