More mypy cleanup... ugh.