Added some more ideas around type determination.