Remove leftover uses of the passes removed in the previous commit.