Use the correct namespace for Type tests
Only strip the namespace once...
Introduce constraints -- or a first pass at them