STRT and STRBT was incorrectly tagged as IndexModeNone during the refactorings (r119821).