Revert "Remove a few type hints that were breaking the tests."
Revert "Remove a few type hints that were breaking the tests."

This reverts commit ebc4eff2b187ab40950ccb4725b7635508b0fceb.

raphaelstolt/construct,jonathantorres/construct,raphaelstolt/construct,jonathantorres/construct