Annotations-only changes for type-checking

[Avasam]

Extracted annotations only changes from #2102 This PR only includes the following, which are much easier and safer to review:

• Comments
• Python 3.7 compatible type annotations
• typing-only new imports