Shaf: Fix types to allow chaining of expect_that with and_that for
different extractors.