Fixed various parsing problems from names gone bad to poor searches for delimeters.
Authored by: madanner 2003-06-20
Parent: [r339]
Child: [r341]