Some strides to the new type checking. I note that clean up is required soon for dead classes. :-)