9af485307e
Not squashing these since they should have gone into the commit before adding type hints.
Not squashing these since they should have gone into the commit before adding type hints.