Added the 'r' and 'i' annotations to instructions as their opcode names have