Match less explicitly to avoid Ruby 2.1.0+ bug

See https://bugs.ruby-lang.org/issues/9285 for more details.

Part of work on #636 to get Ruby 2.1.0 passing.