Changed several small details for manual cleanup.
Authored by: tswift 1999-05-26
Parent: [r797]
Child: [r799]
