Skip the HRM index in filenames where possible

This is just a bit nicer.