Merge pull request #5351 from pks-t/pks/index-map-macros index: replace map macros with inline functions