Overhauled these classes.
They are now safer and simpler to use.
Authored by: keess 2009-01-23
Parent: [r2192]
Child: [r2194]
