2) Don't use strings when I can use atoms. 3) Fix bug 28472 by correcting error in earlier checkin. r=buster@netscape.com