Fix missing cast in C# ExpressionBuilder, and add nop removal.

ICSharpCode.Decompiler/CSharp/ExpressionBuilder.cs

@@ -391,7 +391,7 @@ namespace ICSharpCode.Decompiler.CSharp
 						.WithILInstruction(argInstruction)
 						.WithRR(new ThisResolveResult(inst.Method.DeclaringType, causesNonVirtualInvocation: true));
 				} else {
-					target = Translate(argInstruction);
+					target = Translate(argInstruction).ConvertTo(inst.Method.DeclaringType, this);
 				}
 			} else {
 				target = new TypeReferenceExpression(ConvertType(inst.Method.DeclaringType))

ICSharpCode.Decompiler/IL/Instructions/Branch.cs

@@ -123,6 +123,9 @@ namespace ICSharpCode.Decompiler.IL
 			} else {
 				state.MergeVariables(state.Variables, initialVariables.ToStack());
 			}
+			// No one is supposed to use the variable stack after an unconditional branch,
+			// but let's clear it just to be safe.
+			state.Variables.Clear();
 		}
 	}
 }

ICSharpCode.Decompiler/IL/TransformingVisitor.cs

@@ -57,7 +57,7 @@ namespace ICSharpCode.Decompiler.IL
 		}
 		 */
 		
-		protected bool removeNops;
+		protected bool removeNops = true;
 		
 		sealed class InliningStack : Stack<ILInstruction>, IInlineContext
 		{
@@ -114,6 +114,8 @@ namespace ICSharpCode.Decompiler.IL
 			List<ILInstruction> output = new List<ILInstruction>();
 			for (int i = 0; i < block.Instructions.Count; i++) {
 				var inst = block.Instructions[i];
+				if (removeNops && inst.OpCode == OpCode.Nop)
+					continue;
 				inst = DoInline(stack, inst);
 				if (inst.HasFlag(InstructionFlags.MayBranch | InstructionFlags.MayPop
 				                 | InstructionFlags.MayReadEvaluationStack | InstructionFlags.MayWriteEvaluationStack)) {