- fix comment describing what this is for
  - add lots of indexing macros to this call
Closes SF bug #518989.