Remove some more uses of deprecated `have` matcher.