fixup! Match() should not be lazy