Instruction decoding fixes plus cleanup.