Revert the previous enhancement to the bytecode optimizer.

The additional code complexity and new NOP opcode were not worth it.