Get rid of dead code; integrate code better. Should be equivalent to previous code.
Authored by: duncansands 2003-03-24
Parent: [r1678]
Child: [r1680]
