Changes in the indexing macros (untested!)