Check in changes to MAIndexer and MPIndexer.