Convert more to ObjC.
Get rid of hashtable.