Merge further typing.py changes from upstream.