Bug fixes for the calls to __atom_index().
Authored by: bugman 2009-01-19
Parent: [r8518]
Child: [r8520]