Bugfix: Make type shadowing go the right way in type.py.