Remove type hint template clutter
Merge pull request #609 from JeroenDeDauw/type

Remove type hint template clutter