Code cleanup associated with armour render index.