Removal of references to self and run, and an update to the new data storage object.
Authored by: bugman 2007-11-25
Parent: [r3957]
Child: [r3959]
