Fix expect-match shadowing assertion failure