Cleaned up type hints conflicts in docblocks.