Adding types uncovered some issues that had been 🩹 with `@ts-ignore` comments. We should address those.