Fixing the operand size evaluation.