Code simplification by placement of many objects into the saveframe namespace.
Authored by: bugman 2009-02-22
Parent: [r8844]
Child: [r8846]
