AAC - Register renaming; intro numeration refactor