Implements proper support for single-value matchers