Simplify assert-neutral matching in test case.

Originally committed in r188651, improved/fixed to be assert-neutral by
Takumi in r188661.