Sneaky little bug
Fixed two major bugs.

Bug 1: using map.insert (?) to index items -- where was my head?

Bug 2: dealing with raw instantiation of new-style/old-style python
       classes.