ir: Rearrange instruction definitions.