Cleanup method signatures.

As per guidelines only public methods should be typehinted as it is not cost-free.
The tests broke as at least once null was passed here.