Fixup issue with multiline diffs in custom matchers.

Fix #420 by not forcing expected to be an array in custom matchers.