A lot of the remaining ones are a bit more core, or tricky, but I would have been happy to even go down by 500, much less 1700! There are a lot of remaining ones in the core parts of the code, which can be trickier to auto-migrate. So this might be a bit of a slog, but not nearly as many as I thought