Improved the representation of Primitive and Opcode.