- Post merge cleanup, removed opcode_arm as it's not really needed.