Bring up to current p6 Match spec.

Two small changes which get all the tests passing again.