Add DictType and fix a few types test issues.