This file was being ignored by mypy, we remove that
and add the missing type hints & deal with any fallout.