Getting ready for 2byte opcodes and nitpicking.