Commit bd7db36dc21092c45f74589cbcf6f148e65b9df8

henry 2002-12-17T04:37:08

More refactoring