Remove unneeded calls to with
Added some typehints and minor docblock fixes
Merge pull request #5019 from KennedyTedesco/4.2

Remove unneeded calls to with and minor typehints and docblock fixes